projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f76a5 6f6d7c8)
Auto merge of #2547 - alexcrichton:more-locking, r=brson
authorbors <bors@rust-lang.org>
Wed, 6 Apr 2016 16:56:36 +0000 (09:56 -0700)
committerbors <bors@rust-lang.org>
Wed, 6 Apr 2016 16:56:36 +0000 (09:56 -0700)
Add file locks in a few more locations

One was discovered by making `target_dir` return a `Filesystem`, the other was discovered by failing tests on the nightly OSX bots.

1  2 
src/cargo/ops/cargo_generate_lockfile.rs patch | diff1 | diff2 | blob | history
tests/test_cargo_generate_lockfile.rs patch | diff1 | diff2 | blob | history

diff --cc tests/test_cargo_generate_lockfile.rs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.